Read certificate file ref from DCOD file #121
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
metsma
force-pushed
the
lat
branch
11 times, most recently
from
b777700 to
d22d90e
Compare
Fixes: web-eid#119 Signed-off-by: Raul Metsma <raul@metsma.ee>
mrts
requested changes
Mar 6, 2025
| tag = *begin++; | ||
| if ((tag & 0x1F) == 0x1F) { // Multi-byte tag | ||
| if (!*this) { | ||
| throw std::invalid_argument("Invalid TLV: Unexpected end of tag"); |
There was a problem hiding this comment.
We should use THROW() to get context info into the log, also the error message could be a little more precise:
Suggested change
| throw std::invalid_argument("Invalid TLV: Unexpected end of tag"); | |
| THROW(std::invalid_argument, "Invalid TLV: Multi-byte tag without second byte"); |
| } | ||
|
|
||
| if (!*this) { | ||
| throw std::invalid_argument("Invalid TLV: Missing length field"); |
| if (length & 0x80) { // Extended length encoding | ||
| auto num_bytes = uint8_t(length & 0x7F); | ||
| if (num_bytes == 0 || num_bytes > 4 || std::distance(begin, end) < num_bytes) { | ||
| throw std::invalid_argument("Invalid TLV: Incorrect extended length encoding"); |
| } | ||
|
|
||
| if (std::distance(begin, end) < length) { | ||
| throw std::invalid_argument("Invalid TLV: Insufficient value data"); |
| { | ||
| for (; tlv; ++tlv) { | ||
| if (tlv.tag == tag) { | ||
| if constexpr (sizeof...(tags) > 0) |
There was a problem hiding this comment.
Our coding standard requires using curly braces with if:
Suggested change
| if constexpr (sizeof...(tags) > 0) | |
| if constexpr (sizeof...(tags) > 0) { |
| namespace electronic_id | ||
| { | ||
|
|
||
| struct TLV |
There was a problem hiding this comment.
Needs a brief explanation that the constructor consumes the tag and length so that begin and end point to the value directly:
Suggested change
| struct TLV | |
| /** | |
| * Represents a single Tag-Length-Value structure used in DER-encoded eID card files. | |
| * | |
| * The constructor parses the tag and length from the provided byte range, | |
| * then adjusts its iterators so that `begin` and `end` reference only the value bytes. | |
| * If the TLV is empty, `operator bool()` returns false. | |
| */ | |
| struct TLV |
| KeyInfo authKeyRef() const override; | ||
| KeyInfo signKeyRef() const override; | ||
|
|
||
| const byte_vector& readEF_File(byte_vector file, std::map<byte_vector, byte_vector> &cache) const; |
There was a problem hiding this comment.
Needs reformatting with clang-format.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WE2-1066
Fixes: #119
Signed-off-by: Raul Metsma raul@metsma.ee